Merge branch 'feature/letter-hints'.

author Daniel Carl <danielcarl@gmx.de>

Mon, 24 Nov 2014 20:23:37 +0000 (21:23 +0100)

committer Daniel Carl <danielcarl@gmx.de>

Mon, 24 Nov 2014 20:23:37 +0000 (21:23 +0100)
author Daniel Carl <danielcarl@gmx.de>
Mon, 24 Nov 2014 20:23:37 +0000 (21:23 +0100)
committer Daniel Carl <danielcarl@gmx.de>
Mon, 24 Nov 2014 20:23:37 +0000 (21:23 +0100)
diff --cc doc/vimb.1
Simple merge
diff --cc src/setting.c
Simple merge
author	Daniel Carl <danielcarl@gmx.de>
	Mon, 24 Nov 2014 20:23:37 +0000 (21:23 +0100)
committer	Daniel Carl <danielcarl@gmx.de>
	Mon, 24 Nov 2014 20:23:37 +0000 (21:23 +0100)
		1	2
doc/vimb.1	patch \|	diff1 \|	diff2 \|	blob \| history
src/setting.c	patch \|	diff1 \|	diff2 \|	blob \| history